Merge commit 'upstream/3.11.0.rc1' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Sat, 29 Nov 2008 10:16:39 +0000 (11:16 +0100)
committerStephane Glondu <steph@glondu.net>
Sat, 29 Nov 2008 10:16:39 +0000 (11:16 +0100)
commit6849fd2be86e1693893387de214f743fb5c05b1c
tree904db85f07c98204fb8336aa75fb94b0770ff628
parentc0ea7bb0bfa64b731a3428d8d0b203e6c8bd4ff7
parenta296066e3938ed8657163e9acdfcec4b4e028203
Merge commit 'upstream/3.11.0.rc1' into 3.11/master